From b7221521c6fc2d6c4d06a901b9574709cdacef85 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 14 Sep 2018 09:21:10 +0100 Subject: [PATCH] Build installed-tests Install them in gtk-4-examples for now to avoid the NEW queue. --- debian/changelog | 2 ++ debian/control.in | 2 +- debian/gtk-4-examples.install | 2 ++ debian/rules | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a45314178b..3e720f6038 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ gtk+4.0 (3.92.1-2) UNRELEASED; urgency=medium Drop, obsoleted by commit 02eb344 in GTK+ 3.93 * d/p/no-accessibility-dump.patch: Drop, no longer needed. The build-time tests correctly set GTK_CSD=1 now. + * Build installed-tests + - Install them in gtk-4-examples for now to avoid the NEW queue -- Jeremy Bicha Fri, 19 Jan 2018 22:05:35 -0500 diff --git a/debian/control.in b/debian/control.in index 71c15a2457..73a24eb62a 100644 --- a/debian/control.in +++ b/debian/control.in @@ -213,7 +213,7 @@ Description: example files for GTK+ 4 suites. . This package contains the example files and a demonstration program - for GTK+4. + for GTK+4. It also contains the installed tests. Package: gir1.2-gtk-4.0 Section: introspection diff --git a/debian/gtk-4-examples.install b/debian/gtk-4-examples.install index be5f203739..a6a0a7716b 100644 --- a/debian/gtk-4-examples.install +++ b/debian/gtk-4-examples.install @@ -6,11 +6,13 @@ usr/bin/gtk4-demo-application usr/bin/gtk4-encode-symbolic-svg usr/bin/gtk4-icon-browser usr/bin/gtk4-widget-factory +usr/libexec/installed-tests/gtk-4.0 usr/share/applications/gtk4-demo.desktop usr/share/applications/gtk4-icon-browser.desktop usr/share/applications/gtk4-widget-factory.desktop usr/share/icons/hicolor/*/*/gtk4-demo* usr/share/icons/hicolor/*/*/gtk4-widget-factory* +usr/share/installed-tests/gtk-4.0 usr/share/man/*/gtk4-demo-application.* usr/share/man/*/gtk4-demo.* usr/share/man/*/gtk4-encode-symbolic-svg.* diff --git a/debian/rules b/debian/rules index 800abdcc49..67de10818f 100755 --- a/debian/rules +++ b/debian/rules @@ -91,6 +91,7 @@ debian/%: debian/%.in configure_flags_common = \ --libdir=/$(LIBDIR) \ + --libexecdir=/usr/libexec \ -Denable-test-print-backend=yes configure_flags_deb = \ @@ -99,6 +100,7 @@ configure_flags_deb = \ -Ddocumentation=true \ -Dman-pages=true \ -Dintrospection=true \ + -Dinstall-tests=true \ -Denable-cloudprint-print-backend=yes ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES))) -- 2.30.2